merge trunk
authorKenichi Handa <handa@m17n.org>
Thu, 15 Dec 2011 01:52:31 +0000 (10:52 +0900)
committerKenichi Handa <handa@m17n.org>
Thu, 15 Dec 2011 01:52:31 +0000 (10:52 +0900)

Trivial merge